updated layout/ui