[*] changed made to the layout and design
[*] Applied some differences to the layout