add proper layout