Removed locked from account entity
Changed alerts position