Refactor with cleaner grid lines and beautiful background