Changed layout & added topic selector