Some useless changes
Merged with github version
Placed sidebar framework into app