Use common layout for Account views
Remove unused file