fixed formating and UI