Some layout fixes - Version 0.9.2