remove old current_user and small design tweaks