Added navigation bar color, Changed push/pop to modal