cleanup layout, add proper external buttons