reverted to light layout, added admin functions