Removed a few hard coded strings and is now fetching those from the database