Fix for authentication + some minor updates due to change of weblayout