Cleaned up layout of HTML some