some refactoring
added home alert