@emir-hasanbegovic completed UI, added icons