updated UI, layout