interface layout and fixes