Reorganised content out of main activity and improved entry dialog layouts