Added functions and buttons