Merge pull request #1 from inaka/master

Better alert page display