edited base, index and added login