Cleaned up DOM/CSS a bit to remove UI inconsistencies