current_user bug fix, layouts fixes