Cleanup code and fix container margins