Fixed Bugs and add some functions for Desk part