Fixed style issues as per Admin comments