Make room type counter optional and fix alignment

![image](https://user-images.githubusercontent.com/9200155/32797801-03504fbe-c95a-11e7-9932-db4ea03bde6b.png)
