UI almost done, small and finishing touches