UI more user friendly, still needs completion