fixing bugs and revision for desktop version