Minor cleanup
Refactor and improve entry css