Fix the layout and double segue issues