Improvements and removing base_url from app