#29 #25 Small changes on pages and provide support for login