Edited some layout for users