layout work, removed devise