Cleaned up layout CSS and moved to generic instead