Updated ap layout and welcome views