Seperated into mvc layout and User GUI added