Fixing form entry bug
Style fixes