button & header review & cleanup