Restored layout and added icon