Updated changes
Edited some layout