Did work on primary fields and bug fixing
Added icon images