Re-work for expanded desktop

Signed-off-by: htchoi1995 <htchoi1995@gmail.com>