fix focus?
WIP
fix buttins