Interface cleaned up again, need segues in new layers