@emir-hasanbegovic finished UI