Split ui and navigation code
Split ui and action code