Improved desktop version

Will improve responsive after desktop version is approved