Remove unnecessary primary container and polish widget margins.