Add proper layout