added proper layout