added tabern and crates

also improved gui