Cleaned up CSS and fixed layout