Fix #305 - Updated layout until we have anything better