Fixed paths and added login