Add Toast Animation [1/2]  and cleanup in Settings