[Phoenix] Small layout imporvements