Made new include and added some button features