styling changes, still buggy