Fixed layouting issues