Fixed routing
Added forms
Fixed display and paths
Cleaned up code