Added proper layout - related to #6