Working with static files now
Couple more static fixes