Some style changes and edited entry validation