Made Desktop version show expando border instead of hiding behind the si...

Made Desktop version show expando border instead of hiding behind the sidebar - Also aligned content properly when there is enough room.