update layout, working now