Cleanup and fixed centering issue