Tidy up default widgets, fix layout issues