made the UI look better, add future class structure