Front end
More changes
Done with frontend! Ugly though