layout update

@angkosek 
@jkeslin