Fixed ugly spacing issues