Fixed active function
Merge view
Cleanup code
Minor changes
Merge views