Changed some layout tags and the right top layout