trying to fix buttons, some minor ui things too