Continued developement on UI