* Fixed #26
* Reverted order and fixed home and room links-