fixed little bug and some design stuff