Changed some layout and design