merge
Fix like errors and buttons