Remove hard coded ids, and bug fix in the base view