Comment out unnecessary width and make layout slightly better