Remove nasty grid error and refactor some css