Styling, starting to add export function