Improved button position
Fixed break due to debug stuff